CleanAosp-O/template 4 commits

CleanAosp-O/device_shamu 2 commits

CleanAosp-O/platform_build 1 commit