Merge changes Ie66ba631,Ic42c09a3

author Benedict Wong <benedictwong@google.com>

Fri, 8 Mar 2019 14:35:04 +0000 (06:35 -0800)

committer android-build-merger <android-build-merger@google.com>

Fri, 8 Mar 2019 14:35:04 +0000 (06:35 -0800)
author Benedict Wong <benedictwong@google.com>
Fri, 8 Mar 2019 14:35:04 +0000 (06:35 -0800)
committer android-build-merger <android-build-merger@google.com>
Fri, 8 Mar 2019 14:35:04 +0000 (06:35 -0800)
diff --cc Android.bp
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Benedict Wong <benedictwong@google.com>
	Fri, 8 Mar 2019 14:35:04 +0000 (06:35 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 8 Mar 2019 14:35:04 +0000 (06:35 -0800)
		1	2
Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history