ERROR

Bug: 8291716
Change-Id: Ia270f074b574a8fe86b5ad435bdef80999c64295

Conflicts:
	tests/Android.mk
Merge branch 'test_4.3r2.2' of github.com:mbc596/android_bionic into test_4.3r2.2

Conflicts:
	tests/Android.mk