Merge "Simplify framework-t/Sources.bp"