Android 5.1.1 release 9
Merge "Fix indirect miuse of $(my-dir)."