Merge "Don\'t reset LOCAL_*MODULE_STEM." am: e77e5e7
am: 07ad876

* commit '07ad8765abefd43b2290e1fc61dc17a69e423f42':
  Don't reset LOCAL_*MODULE_STEM.

Change-Id: I55821cf233aa78f3e451c0b1fa255864b63b9749