Merge "gn2bp: Update desc json and Android.bp.swp"