Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"