DO NOT MERGE Fix unexpected behavior in SDP am: 6ee3d8e16c
am: 24f55d16a7

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