Merge "Change aapt's warning message to suggest formatted="false", not "true"." into gingerbread