[automerger skipped] Merge "Add preprocessed property for android_test_import"...
[automerger skipped] Merge "Add preprocessed property for android_test_import" into rvc-dev am: 753c739e -s ours am: 1c21a6c3 -s ours
am skip reason: Change-Id If0c27c1e340c1bdb270064f636dc6bf33a0fc949 with SHA-1 3b70b3fe is in history
Change-Id: I3a3c768b922a4c06422565b0bfa8fa1964cff162