Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master

For a faster browsing experience, only 20 of 242+ files are shown. Download one of the files below to see all changes.