Merge "Make android_test_helper_app support apex_available"
am: ee76fba905

Change-Id: I240799a87f24e02e59bbcce460fe3be46a64c092