Merge "Get android.os tests running against real APIs."