Merge "Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 am: 97cdd11f2a" into nyc-mr1-dev-plus-aosp