Merge "Add pebble shape to Android.mk" into rvc-dev am: e13fab2d48 am: 8a2cf06d8c

Change-Id: I0290c07902f542e2ea4b52e0d154229e4d03ccdb