am 48f597c8: am c1efd41f: (-s ours) Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)

* commit '48f597c8043a46ed1098612f696fa224428f975a':
  Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)