ROMStats Tests

For Matt
Merge branch 'jb3' of https://github.com/CarbonDev/android_vendor_carbon into jb3
Merge remote-tracking branch 'upstream/jb3' into local_jb3