am 047a33dc: am a5e92a1b: Merge "Docs: Add ro.hwui.patch_cache_size ro.zygote.disab Bug: 9258861"

* commit '047a33dc43a3b1a7a043271c7128001e04860363':