Merge "Remove f/b based jars out of the Android.mk" into ub-launcher3-master