Merge "Merge "Allow apps to load libraries from under /data" into nyc-dev am:...
Merge "Merge "Allow apps to load libraries from under /data" into nyc-dev am: a3165791 am: b1a3efdc" into nyc-mr1-dev-plus-aosp
am: 6956f23d
* commit '6956f23d':
Change-Id: I2b51b36f13e846de9b1d96d2a38920c78e75692b