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