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

Change-Id: If54ca2c15126212c7c4e2009fe324754399ae946