DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I3169526666d74b36b374462970c2b0dbb01f035e
tree: 787eaae95d55a768a7b7deb0d61d1481ad4f877e
  1. Android.mk
  2. thermal-845.c
  3. thermal-8998.c
  4. thermal-default.c
  5. thermal.c