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

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