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

Change-Id: Ie15979a0d72d397582155075d6423ca7cf6ba063