am 059ba981: am 386dcbdd: Merge "Frameworks/base: Fix missing cast"

* commit '059ba9814bb07aeebd8bf697fc05ff833c63033b':
  Frameworks/base: Fix missing cast