Android 5.1.0 release 4
Merge "Fix indirect miuse of $(my-dir)."