[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am: 1bd445ffc2 am: 3eb8f15589

Change-Id: Iea2346e652fe6bb086e894615bb409491d60457d
tree: 2b99f72b40026d3cf5b6ed4818e9c21a371e94ab
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE