Merge "Reverted aapt dependency to be a dependency on libandroidfw"