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