am fb897e1c: Manually cherry-pick patch skipped by automerger

# Via Adam Powell
* commit 'fb897e1cdec9b60517bb07f8c54f330275a6c281':
  Manually cherry-pick patch skipped by automerger
tree: 5f57f25f0b7ce57e7e35b35016d390bc2377f4f7
  1. appcompat/
  2. renderscript/
  3. v13/
  4. v4/
  5. v7/