am 604f52e3: Reconcile with AOSP master

* commit '604f52e31357a774ad49290e323976b1db5b9f38':
  Fix build