Merge "Allow apps to load libraries from under /data" into nyc-dev