Merge "Strip LOCAL_MODULE before referencing it." am: 411b2f90a9 am: fbb85a95b5
am: 86a7c218e0

* commit '86a7c218e02e59810525f28da9b81eca4390bbbf':
  Strip LOCAL_MODULE before referencing it.