am ded6640d: Merge "Don\'t set up the prebuilt apk rule twice."

* commit 'ded6640d970d83cb18ce2585565c11799064f5e0':
  Don't set up the prebuilt apk rule twice.