Merge "Remove header from LOCAL_SRC_FILES"
am: 1287f6e0af

* commit '1287f6e0afe146657a7d48167710947447e8693f':
  Remove header from LOCAL_SRC_FILES