Merge "Remove deps on frameworks/opt/datetimepicker"