Android CTS 5.0 Release 7 (2906672)
Merge "Fix indirect miuse of $(my-dir)."