merged in preview binaries 1358001, merged in matching aosp hal files
Merge branch 'master' of https://github.com/Android-L-Porting-Team/Flo-L-Rebase