Merge "Allow shell /proc/loadavg access" am: ba1be2c4bb am: 1ad7030ef8
am: a9498ba0c5

Change-Id: I607a43b29c3c66127bdf9639ca0885d22623f79c