Merge 653756b45aa59e0b8c1ce56e078e1223789c14c9 on remote branch

Change-Id: If0502d57ff8006e3a1f31aa9e25f995f0fb6b7a0
tree: 4318556939bf364b8660486de992aa2b6d748f74
  1. Android.bp
  2. Android.mk
  3. NOTICE
  4. thermal_client.h