Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  IMS: Add check for GBA SIM
  IMS: Dont clean merge info on host termination

Change-Id: I7e9226efd9dd4cca403e70c56dc0a6c6f14e503d
tree: 130c848b97313ba85a06358e4b39a88a448d6495
  1. src/
  2. Android.mk
  3. CleanSpec.mk
  4. README.txt