Fix indirect misuse of $(my-dir).

Change-Id: I20a98a8e1378da3a53e6a6d599c8fc0100f7f87a
Signed-off-by: houst0nn <houstonn@gmail.com>
Merge "Fix indirect misuse of $(my-dir)." into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/am/ActiveServices.java

Change-Id: I9f2e6dd827ea6869cef0c5f9b06e14fc446cd0c3