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

Change-Id: Ibc8a4fa50987c1aa29143be2d82d294cb233b796