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

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