Merge "Add preprocessed property for android_test_import" am: 42ada5cff3

Change-Id: Ie29e07ede82444235182a79aa74939e9358e7389