Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d am: 8a2cf06d am: 089d3297 am: 10a96856 Change-Id: Icff0d5981660df0dbe86fe4a3fc31b13690fe771