Merge "Update ninepatch prebuilt" into nyc-dev am: 090ae0cfa1 am: ae5986e740
am: 5182e681e2

Change-Id: I08b9769b3e15a1fe484e6e4a069c3d548a1f3ec0