Merge "Remove header from LOCAL_SRC_FILES"
am: 5cfc02e4b1

* commit '5cfc02e4b128296070a82f8e6ee4a83af3c9965b':
  Remove header from LOCAL_SRC_FILES