Merge "Add Android.bp for ecc proto" am: 857381b4d1
am: 4eec01f396

Change-Id: Id03995b272b4d26eaf9f1d567c99bf7b57a1ef03