Add hidden minor version ID for support lib workarounds.

Change-Id: I7940e32c78caaab351fb28d92e5fadbea6292b27
Merge "Add hidden minor version ID for support lib workarounds."
Check the return value of listFiles on the ifw directory

listFiles can return null if the directory doesn't exist

Bug: 10497143
Change-Id: Ie4cbdf18a259a9641669a4e6b9bf49b4879acc67
Merge "Check the return value of listFiles on the ifw directory"
Fix destruction issues relating to AllocationAdapter.

bug 12971201

Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
Merge "Fix destruction issues relating to AllocationAdapter."
Merge branch 'master' of https://android.googlesource.com/platform/frameworks/base into HEAD