Merge "Add android.test.* api files" into pi-dev-plus-aosp