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

Change-Id: Id1e9103b52b701ea243670f3adc6aa2e05156151