am df0c90d0: am ce418783: am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"

* commit 'df0c90d0e544c9353df0135a23643aea043a9f4b':
  Don't modify LOCAL_STRIP_MODULE