am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"

* commit 'a133bc87eb8269a6fa61772cb708f10c9c3b7a87':
  build fix for aosp-idea133 @ 1119318