Merge "Add ActivityManager UidImportanceListener to libandroid"