Android l-preview release 2
Merge "Fix indirect miuse of $(my-dir)."