Merge "Switched to use header files in /frameworks/native"