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

Change-Id: If487039bfc960ded2127a77d814e9501940273c5