merge
tree: 5aaadeda18be829509eff0ff36845fdcfc5cbe80
  1. Android.mk
  2. framework.jar