Merge "Remove MODULE_LICENSE_APACHE2 from apps/Gallery" am: 017b75c282

Change-Id: I735fa585cc17d3377a92dd6f2c5ceda7a34be1e9