Merge changes I140d291e,Id443ec5c

* changes:
  remove files that moved to frameworks/native
  fixup hardcoded include paths for new project