Merge "Don't read /data/local.prop on user builds"