Merge changes I931dafbb,I845672b2 into oc-mr1-dev

* changes:
  Thermal 1.1 test statically links to hal def libs.
  Update thermal hal Android.bp.