Merge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp