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

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