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