Merge "Fix link-type errors on some tests" am: 132ee4413d
am: 1c6a18e6ed  -s ours

Change-Id: Id596db4c12bf8005615ebc57bce217c512a4d1a4
tree: 4aba39348273730bfdcf2229e542f0e37b7c31cf
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk