Merge "Update elements in android tree as in lmp-dev" into upstream-master