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

Change-Id: I7fb1ca2c0433f21edefcefe8273bb1d8a8383868