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

Change-Id: I807c53983881ca8ff1569e233c3899d43fdd86db