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

Change-Id: Ib860ad8455358f2c84c8ef425e37766754fe97a2