Android CTS 5.1 Release 9 (3046116)
Merge "Fix indirect miuse of $(my-dir)."