Merge "Remove unused imports of android_runtime headers"