Merge remote-tracking branch 'goog/pi-dev.bak'

Bug: 111553225
Change-Id: Ie2166e88663c60906a5e87d67ef6851a9292d309
tree: 90b08735094ac972cc351653526c210904727c0f
  1. Android.mk
  2. thermal-845.c
  3. thermal-8998.c
  4. thermal-default.c
  5. thermal.c