Merge "Adding AOSP into the tapl library name." into ub-launcher3-master