am 5bd11b48: Merge changes Ib13d9654,I98723ccd

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