Merge "Include all standard shared library paths in /system/lib"