Merge "Convert Contacts to Android.bp" am: e88ebe6960 am: 9d6eaf7ea0 am: 6f6cbe18c3

Change-Id: I3233d941488ec5c05710ecbb784bc31efb67e45b