am 46452519: Merge "Refresh android-20 headers/libs"

* commit '4645251978aaa9e9db0501efb03f56432a1b9b85':
  Refresh android-20 headers/libs