Merge "Remove apache dependency from android-common."