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

Change-Id: Iec2257a5b00abbbe490b40c245bd324c77d4d7ac