Merge "Add Android.bp for ecc proto"