Merge "Remove SRC_SYSTEM_HEADERS"
am: 4a6862e59b

Change-Id: I7864a2f482240f9e310d913d3dec07f99ad20c67