Merge "Add -round and -notround qualifier to android runtime/aapt" into mnc-dev