Merge "Update AAI version numbers in java manifest" into beijing