am b36cfdb7: am 4b53b014: am 5bd11b48: Merge changes Ib13d9654,I98723ccd

* commit 'b36cfdb718f30c667858f8bac04d012366dca94f':
  system/core: remove $(KERNEL_HEADERS) from includes
  libcutils: fix atomic_memory_store_barrier