Merge ba2d438d000537f8c2a08f8a79646739ea8d35a8 on remote branch

Change-Id: I634f9fdad7156c0e5d18162234fc1017f9e471d7
tree: eaf8aea6b7653093f478b9905f3ccdb056242108
  1. rcs_service_aidl/
  2. rcs_service_api/
  3. Android.mk