Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff" into mnc-dr1.5-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: a6d9c14313 am: 0393d440bd am: 6c054a11f8
  [automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: a6d9c14313 am: 0393d440bd
  [automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: a6d9c14313
  DO NOT MERGE: SDP: Recalculate param_len after max_list_len
tree: f1031f54153a4011b95d950500b319d0dcb9f564
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE